From: danh-arm Date: Thu, 18 Feb 2016 18:36:00 +0000 (+0000) Subject: Merge pull request #523 from jcastillo-arm/jc/genfw-791 X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=85df7e44ce3974e2c78d99e6ea31f047de6de445;p=project%2Fbcm63xx%2Fatf.git Merge pull request #523 from jcastillo-arm/jc/genfw-791 ARM platforms: rationalise memory attributes of shared memory --- 85df7e44ce3974e2c78d99e6ea31f047de6de445 diff --cc include/plat/arm/css/common/css_def.h index 3d6884a8,7a5d1939..f92126ba --- a/include/plat/arm/css/common/css_def.h +++ b/include/plat/arm/css/common/css_def.h @@@ -139,10 -115,7 +137,8 @@@ #define SCP_BL2_BASE BL31_BASE #define SCP_BL2U_BASE BL31_BASE +#endif /* CSS_LOAD_SCP_IMAGES */ - #define PLAT_ARM_SHARED_RAM_CACHED MHU_PAYLOAD_CACHED - /* Load address of Non-Secure Image for CSS platform ports */ #define PLAT_ARM_NS_IMAGE_OFFSET 0xE0000000